menu: Popup at window coordinates if widget is given

Since widget allocations are now relative to the parent's origin, we
need to pass the window allocation here.

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 1ac19c030c725d208f66ce6e7c53f4295aa0a609..368fad71ac5a1b01b03903707be0b792411c0ce3 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -4085,7 +4085,7 @@ gtk_menu_position (GtkMenu  *menu,
   else if (priv->widget)
     {
       rect_window = gtk_widget_get_window (priv->widget);
-      gtk_widget_get_allocation (priv->widget, &rect);
+      gtk_widget_get_window_allocation (priv->widget, &rect);
       text_direction = gtk_widget_get_direction (priv->widget);
     }
   else if (!priv->position_func)

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 55849fb28cf0821b76d1e75082cf25817ea8ffe6..76054b47679a786f24a5a54150415079ea3156f3 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4927,8 +4927,6 @@ gtk_widget_get_window_allocation (GtkWidget     *widget,
   GtkWidget *parent;
   GtkAllocation alloc;
 
-  g_assert (gtk_widget_get_has_window (widget));
-
   /* Don't consider the parent == widget case here. */
   parent = _gtk_widget_get_parent (widget);
   while (parent && !_gtk_widget_get_has_window (parent))